]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
st: Replace ClutterSize by graphene_size_t
authorGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Wed, 20 Feb 2019 13:33:42 +0000 (10:33 -0300)
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Wed, 16 Oct 2019 10:49:04 +0000 (10:49 +0000)
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/421

src/st/st-icon.c

index 2db0ba20ccedb3d2f3ebda972585ed73579d2dab..71a6b8980ec340f14605a172944e7ca378283400 100644 (file)
@@ -48,19 +48,19 @@ static GParamSpec *props[N_PROPS] = { NULL, };
 
 struct _StIconPrivate
 {
-  ClutterActor *icon_texture;
-  ClutterActor *pending_texture;
-  guint         opacity_handler_id;
-
-  GIcon        *gicon;
-  gint          prop_icon_size;  /* icon size set as property */
-  gint          theme_icon_size; /* icon size from theme node */
-  gint          icon_size;       /* icon size we are using */
-  GIcon        *fallback_gicon;
-
-  CoglPipeline *shadow_pipeline;
-  StShadow     *shadow_spec;
-  ClutterSize   shadow_size;
+  ClutterActor    *icon_texture;
+  ClutterActor    *pending_texture;
+  guint            opacity_handler_id;
+
+  GIcon           *gicon;
+  gint             prop_icon_size;  /* icon size set as property */
+  gint             theme_icon_size; /* icon size from theme node */
+  gint             icon_size;       /* icon size we are using */
+  GIcon           *fallback_gicon;
+
+  CoglPipeline    *shadow_pipeline;
+  StShadow        *shadow_spec;
+  graphene_size_t  shadow_size;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (StIcon, st_icon, ST_TYPE_WIDGET)
@@ -290,7 +290,7 @@ st_icon_clear_shadow_pipeline (StIcon *icon)
   StIconPrivate *priv = icon->priv;
 
   g_clear_pointer (&priv->shadow_pipeline, cogl_object_unref);
-  clutter_size_init (&priv->shadow_size, 0, 0);
+  graphene_size_init (&priv->shadow_size, 0, 0);
 }
 
 static void
@@ -317,7 +317,7 @@ st_icon_update_shadow_pipeline (StIcon *icon)
                                                    priv->icon_texture);
 
           if (priv->shadow_pipeline)
-            clutter_size_init (&priv->shadow_size, width, height);
+            graphene_size_init (&priv->shadow_size, width, height);
         }
     }
 }